Makefile: build doc in a version-specific directory, add dependencies up Makefile...

babelmain.xsl: make includes relative.
mkcapabilities: hook links up to development tree.

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 7bdb2eeeba4967da950b5603fa709cfec436f12f..7f586872bf35e8c66084899c211ab978a727e2b5 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -6,6 +6,7 @@ VERSD=1.2.8
 RELEASE=-beta20060423_GSAK
 VERSIONU=$(VERSU)$(RELEASE)
 VERSIOND=$(VERSD)$(RELEASE)
+DOCVERSION=development
 
 # VERSIONU=1_2_7
 # VERSIOND=1.2.7
@@ -81,7 +82,7 @@ OBJS = main.o globals.o $(LIBOBJS)
 
 
 
-# Directory of web doc 
+# Directory of local web doc.  Traditionally a sibling to the GPSBabel tree.
 WEB=../babelweb/
 
 
@@ -90,6 +91,9 @@ all: gpsbabel@EXEEXT@
 gpsbabel@EXEEXT@: $(OBJS)
        @CC@  $(CFLAGS) $(OBJS) @LIBS@ @USB_LIBS@ $(LIBEXPAT) $(OUTPUT_SWITCH)$@
 
+Makefile: Makefile.in config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
+
 globals.o:
        @CC@  @CPPFLAGS@ -c $(GBCFLAGS) -DVERSION=\"$(VERSIOND)\" $< $(OUTPUT_SWITCH)$@
 
@@ -125,11 +129,11 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile.in and bring in /tmp/dep
 
-$(WEB)/htmldoc/readme.html: readme.xml 
-       xmlwf $<   #check for well-formedness
-       xmllint --noout --valid $<    #validate
-       xsltproc   \
-        --stringparam base.dir "$(WEB)/htmldoc/"    \
+$(WEB)/htmldoc-$(DOCVERSION)/readme.html: readme.xml babelmain.xsl
+       xmlwf $<                        #check for well-formedness
+       xmllint --noout --valid $<      #validate
+       xsltproc \
+        --stringparam base.dir "$(WEB)/htmldoc-$(DOCVERSION)/" \
         --stringparam root.filename "readme" \
         babelmain.xsl \
         $<
@@ -138,7 +142,7 @@ $(WEB)/htmldoc/readme.html: readme.xml
 readme.txt: readme.html
        lynx -nolist -dump readme.html  > $@
 
-doc: $(WEB)/htmldoc/readme.html # readme.txt
+doc: $(WEB)/htmldoc-$(DOCVERSION)/readme.html # readme.txt
 
 release: 
        cvs commit

diff --git a/gpsbabel/babelmain.xsl b/gpsbabel/babelmain.xsl
index eaea406f33eb09433b966df4501fc733eaa80deb..5d0fe1cd2a8ae8e803d438a42b7a681433848f57 100644 (file)
--- a/gpsbabel/babelmain.xsl
+++ b/gpsbabel/babelmain.xsl
@@ -13,7 +13,8 @@
   <xsl:text>
 
   </xsl:text>
-  <xsl:comment>#include virtual="doc-header.inc" </xsl:comment>
+  <xsl:comment>#include virtual="../navbar.inc" </xsl:comment>
+  <xsl:comment>#include virtual="../doc-header.inc" </xsl:comment>
   <xsl:text>
 
   </xsl:text>
@@ -23,7 +24,7 @@
   <xsl:text>
 
   </xsl:text>
-  <xsl:comment>#include virtual="doc-footer.inc" </xsl:comment>
+  <xsl:comment>#include virtual="../doc-footer.inc" </xsl:comment>
   <xsl:text>
 
   </xsl:text>

diff --git a/gpsbabel/configure b/gpsbabel/configure
index bbcf16106f7d8ff8e4c56c79c951052914aa2cfd..12a6797279b60edbd7f4ffa0093962453826bb58 100755 (executable)
--- a/gpsbabel/configure
+++ b/gpsbabel/configure
@@ -2497,8 +2497,6 @@ _ACEOF
 fi
 
 
-#AC_ARG_ENABLE(allcet, "Enable all character sets", AC_DEFINE(WANT_ALLCET, 1, [Define if you want support for all known character sets]))
-#AC_ARG_ENABLE(cet, "Enable character sets=(default,all,minimal)")
 
 # Check whether --with-cet or --without-cet was given.
 if test "${with_cet+set}" = set; then

diff --git a/gpsbabel/tools/mkcapabilities b/gpsbabel/tools/mkcapabilities
index 9eae0813164fdc6b458c9890e25b44c0105bfaaf..4aa6732cad7854deb1aa72283a8bc0357a57d9bc 100755 (executable)
--- a/gpsbabel/tools/mkcapabilities
+++ b/gpsbabel/tools/mkcapabilities
@@ -4,7 +4,7 @@ function getcap(type, cap, sname, lname) {
        print "<tr>"
        print "<td class=\"fmtline\">" lname "</td>"
 
-       print "<td class=\"c4\"> <a href=\"" sname ".html\">" sname "</a></td>"
+       print "<td class=\"c4\"> <a href=\"htmldoc-development/" sname ".html\">" sname "</a></td>"
        # This is bad...
        
        printf "<td class=\"c4\">"